From fee852c69d147620414f129a1ec48c8a9b7c8a1e Mon Sep 17 00:00:00 2001 From: robertl Date: Sun, 4 Sep 2005 23:44:41 +0000 Subject: [PATCH] Olaf adds read support for MS Autoroute. --- gpsbabel/Makefile | 3 +- gpsbabel/README | 7 ++ gpsbabel/reference/route/msroute-sample.axe | Bin 0 -> 9216 bytes gpsbabel/reference/route/msroute-sample.gpx | 89 ++++++++++++++++++++ gpsbabel/testo | 6 ++ gpsbabel/vecs.c | 8 ++ 6 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 gpsbabel/reference/route/msroute-sample.axe create mode 100644 gpsbabel/reference/route/msroute-sample.gpx diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile index 52727d918..1de963c66 100644 --- a/gpsbabel/Makefile +++ b/gpsbabel/Makefile @@ -39,7 +39,7 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \ igc.o brauniger_iq.o shape.o hiketech.o glogbook.o coastexp.o \ vcf.o overlay.o kml.o google.o lowranceusr.o an1.o tomtom.o \ tef_xml.o maggeo.o pathaway.o vitosmt.o gdb.o bcr.o coto.o \ - ignrando.o stmwpp.o + ignrando.o stmwpp.o msroute.o FILTERS=position.o duplicate.o arcdist.o polygon.o smplrout.o reverse_route.o sort.o stackfilter.o trackfilter.o discard.o @@ -215,6 +215,7 @@ main.o: main.c defs.h queue.h gbtypes.h mapsend.o: mapsend.c defs.h queue.h gbtypes.h mapsend.h magellan.h mapsource.o: mapsource.c defs.h queue.h gbtypes.h garmin_tables.h mkshort.o: mkshort.c defs.h queue.h gbtypes.h +msroute.o: msroute.c defs.h queue.h gbtypes.h navicache.o: navicache.c defs.h queue.h gbtypes.h cet_util.h netstumbler.o: netstumbler.c defs.h queue.h gbtypes.h csv_util.h nmea.o: nmea.c defs.h queue.h gbtypes.h diff --git a/gpsbabel/README b/gpsbabel/README index 5c49caafb..269aa9dab 100644 --- a/gpsbabel/README +++ b/gpsbabel/README @@ -1051,6 +1051,13 @@ THE FORMATS index - Use route/track number from input data for output. + MSroute + + Input support for Microsoft AutoRoute 2002 .axe files. + These files contains only routes. We can extract the coordinates + and the names of the points within route. An export to this format + will not be supported. + DATA FILTERS GPSBabel supports data filtering. Data filters are invoked from diff --git a/gpsbabel/reference/route/msroute-sample.axe b/gpsbabel/reference/route/msroute-sample.axe new file mode 100644 index 0000000000000000000000000000000000000000..299f8e15ed06ba665470ab4a67e9ba35eaaa7b08 GIT binary patch literal 9216 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 literal 0 HcmV?d00001 diff --git a/gpsbabel/reference/route/msroute-sample.gpx b/gpsbabel/reference/route/msroute-sample.gpx new file mode 100644 index 000000000..677d4d87a --- /dev/null +++ b/gpsbabel/reference/route/msroute-sample.gpx @@ -0,0 +1,89 @@ + + + + + + Plauen + + + Treuen + + + Rodewisch + + + Stützengrün + + + Hundshübel + + + Zschorlau + + + Aue + + + Lauter + + + Schwarzenberg + + + Markersbach + + + Schlettau + + + Talstraße, 09456 Annaberg-Buchholz + + + Frohnau + + + Geyer + + + Zwönitz + + + Grünhain + + + Beierfeld + + + S274 + + + Sosa + + + Blauenthal + + + Schönheide + + + Schnarrtanne + + + K7820 + + + Rodewisch + + + Treuen + + + A72, 08233 Treuen + + + diff --git a/gpsbabel/testo b/gpsbabel/testo index 4cc088d35..2f1c8789b 100755 --- a/gpsbabel/testo +++ b/gpsbabel/testo @@ -853,4 +853,10 @@ compare ${TMPDIR}/stmwpp-route.gpx reference/route/stmwpp-route.gpx ${PNAME} -i stmwpp -f reference/route/stmwpp-route.txt -o stmwpp -F ${TMPDIR}/stmwpp-route.txt compare ${TMPDIR}/stmwpp-route.txt reference/route/stmwpp-route.txt +# +# Microsoft AutoRoute 2002 test (read-only) +# +${PNAME} -i msroute -f reference/route/msroute-sample.axe -o gpx -F ${TMPDIR}/msroute-sample.gpx +compare ${TMPDIR}/msroute-sample.gpx reference/route/msroute-sample.gpx + exit 0 diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c index 9fb4d0c01..12a3d5944 100644 --- a/gpsbabel/vecs.c +++ b/gpsbabel/vecs.c @@ -89,6 +89,8 @@ extern ff_vecs_t coto_vecs; extern ff_vecs_t ignr_vecs; extern ff_vecs_t stmwpp_vecs; +extern ff_vecs_t msroute_vecs; + static vecs_t vec_list[] = { /* XCSV must be the first entry in this table. */ @@ -442,6 +444,12 @@ vecs_t vec_list[] = { "Suunto Track Manager (STM) WaypointPlus files", "txt" }, + { + &msroute_vecs, + "msroute", + "MS AutoRoute 2002", + "axe" + }, { NULL, NULL, -- 2.30.2